Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 27 Mar 2011 02:32:40 +0000 (19:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 27 Mar 2011 02:32:40 +0000 (19:32 -0700)
commit2c5ffdbb7f22dc2a5ff7e02cdca96accf28a6b92
tree5615dbed7a5d2844b78700dbdc1ee29889ed92e6
parentffc3a40788800ee1f8d79dd2237209468a1721d7
parent7c190b2147345dca4b852f386f001bf3a76aed59
Merge from mainline.
src/ChangeLog
src/data.c
src/keyboard.c
src/keyboard.h
src/lisp.h
src/process.c
src/xdisp.c